Merge tag 'upstream/2017.6' into debian/master
authorSimon McVittie <smcv@debian.org>
Wed, 24 May 2017 18:00:24 +0000 (19:00 +0100)
committerSimon McVittie <smcv@debian.org>
Wed, 24 May 2017 18:00:24 +0000 (19:00 +0100)
Upstream version 2017.6


Trivial merge